Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 Jan 2012 19:31:34 +0000 (11:31 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 Jan 2012 19:31:34 +0000 (11:31 -0800)

Trivial merge